projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c3a884 2446862)
bitkeeper revision 1.1108.1.19 (410147dbq0BGlUNlKhUZaPOQEqSBAg)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Fri, 23 Jul 2004 17:16:11 +0000 (17:16 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Fri, 23 Jul 2004 17:16:11 +0000 (17:16 +0000)
Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/hp.bk

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
tools/python/xen/xend/XendClient.py patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
diff --cc tools/python/xen/xend/XendClient.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.